Fixed some minor errors

Fixed errors in:

* classes in wrong packages
* wrong method modifiers
* sintaxis errors in XML
* imports
I'm curious: what's the reason behind this change?