updated asset structure and a few other things
Merge pull request #1 from andimal/0-0-2

updated asset structure and a few other things