Reorganized code and simplified UI
Merge pull request #1 from pepedocs/refactor_organize_code

Reorganized code and simplified UI