Minor folder cleanup/reorganization