moving and renaming some files
rebuild the way things are loaded
changing indentation + minor fixes