Moved Core Project Code Into Solution