Renamed and restructured some files
minor updated mds