Fix a couple of syntax errors
Revert import changes from https://github.com/DesertBot/DesertBot/commit/6fd08d619d53e8b0f7d765238586f243c0835caf
The package structure was decided on by Hubbe and myself and was done so the modules and the core have consistent import structure (see txircd as an example). Also, in the future please refrain from making big structure changes like this before discussing it first.