project restruct
sp2. unfinished