Refactored for packages and classes

Just reorganized our packages and classes