refactoring to using modules
changing the web interface