Initial cleanup

This PR ensures that the application becomes more generic and runs on all servers / computers