Reorganised art folder structure
Various bug/warning fixes
Thur 9/10/14.