Restructure as a stand-along project