* update to new API and libs
* improve folder structure