Organized files and basic UI - no functionality
Merge branch 'master'