moving around files for better structure
removing unneccessary space and standardize code