CHANGE: Renamed methods folders.

Removed hyphons and suffix.