Structure and VCS cleanup
Structure and VCS cleanup