Refactor the file structure, lots og grunt updates