Simplified structure and cleaned code

Cleaned up code for shinyapps.io