Did some renaming and package-restructurering