added rotating to menu icon and cleaned file structure