rearranged some classes and packages so its not as confusing to find stuff! :)