Some clean up, to avoid unnecessary packages..
Clean up source directory, to remove unnecessary package decls.
Delete old code.