Pull out toystore + celluloid to a module