Restructured project to use yoeman