Reorganized file structure and added many files