File rearrangement
Package rearrangement
Modifications to package files.
Moved tests around