Altering files to reflect new structure; making sure it still builds.