(fix) #noticket Rebuilding repo with fresh layout