Changed project to a MVP structure.