Rearranged stuff so it is easier to find

will have to make sure to track any created class files