Restructure project tasks ember
Simplify org addresses