Removed modules and migrated code back into top layer of store app.