Move files to mimic sourcesets preferred locations
Move files to mimic sourcesets preferred locations