utils added, ember app refactored