fix import paths
make stores almost work