Committing all changes so far. Renaming solution/project in next commit.