Re-Organzie

Classes are implemented. Need Icons, Storyboard.