Structure and VCS cleanup