cleanUp

Moving some files around.