Optimize App Skeleton to new Core organisation