Some project structure modifications.