Change to use fixtures and ember store + refactoring and simplification