reorganizing

Put the source files into a package