Package restructure and additional alias schema change fix