Merged all files from GSWM repo