Change to use fixtures and ember data + refactoring and simplification