major changes has been made
Reworked file structure