Some cleanup and moving files