Rearrange some files
More tweaks