Added platform specific stuff in sub directories
Added sudirectory in file names
Keeping directory