reworked file structure
reworked file structure