Cleanup, and get it working not in the root.