Fixed project structure, and renamed.