update to split into logical classes

fixes #8
move images folder