Moved Classes for Better Organization

Hooks have been made more lean.