Rename modules
Merge pull request #28 from golyshevd/core

Rename modules