restructured src dir and sugar file