Lots of refactoring, updating to new versions of Ubuntu, removed some old stuff