re-structure, remove ArtworkItem and related
refactoring
new files