Refactored Code

Relocated certain classes in their appropriate package.