Attemped to rename and rafactor project.