Reorganised art folder structure
Various bug/warning fixes