Some cleanup of unnecessary files, and organizing some others