Removing AppGW as a separate folder