Project restructured and cleaned from previous repository