Big refactoring to the file structure to create an easier tool