Some renames and miscellaneous stuff
This is the typical commit you have to do to continue work later in a different location, but that its totally messed up