Restructure into single package, change visibility to package only.