bumped version, renamed controller to match naming
merged Location controller with Home controller