Merge_Master_BasicAppStructure