Changed file structure and deleted un-needed files