Reorg for gradle
More launcher tweaks