Project restructured and restarted