Some cleanup, file rename