Fixed some structural issues with the project.