Restructure

Remove suffix from files (-m, -v, -c) now in respective folders