Reworked file structure
Reworked file structure