Changed the 'main' files to the new structure, it's the fastest yet