Removed a few classes from top-level of package (we can add them back when needed)