New file structure to make more order in the code..