Refactor packages and classes to more appropriate locations