Merge pull request #13 from lightsoda/master

Source files for mockups
Reorganised @lightsoda's source files and mockups