Cleanup, and add .keep files