Cleanup and move into nicer directories