did a bit of refactoring to hide all the application classes under a directory