Moving code around into more sensical package names
Minor updates