More tweaks and re-org