Restructured assets

According to changes of project setup