Jung's changes

Changes to file-structure and user interface. Great job, thanks!
Merge branch 'jung3o-master'