Tech Debt: Properly name and structure files in a more ember like way