Revert "Rename module directories to follow naming conventions"

This reverts commit 0bf3c7e2b41fee06045f068c069293ba1d1aaffa.