restructured project + libs