Second commit with refactoring project to top level of git project.