un-revert merge of PR#928, now in a branch

This reverts commit 124def360223447db790adeba1ef1b799730b26b.
Updated texture loading

handled the move into the assets/ directory
also updated texture names
Merge branch 'snapshot'