Simplify requiring of files from subdirectories
Fix call of store info and stores list