Small Reorganization:
moved reader and writer to own package
renamed reader and writer
changed "shops" accordingly