Attempting to rearrange file structure to make merging easier.