Changing around the file structure, also working on the type-system!