Moving some files around
WIP on application logic