Reorder some files in the project

For cosmetic reasons only