Finished the reestructure of the files. Now I need to fix some bugs -.-