Reworked file structure to try and keep things consistent