Moved classes and packages around to make things easier to find