Moved the whole thing to MVN project