File organisation changed.
Merge remote-tracking branch 'bonzoq.shopme.git/master'