Cleaned up SD2 structure Still some tweaks that could be done to the cmake file, will come back to this later