Move everything into packages

Modularize the application a little bit