MDL-31989: Removed unwanted files + making GS modular