now all files in place and compiles. need to move some files out of package