Restructured the project to be more gem like