Fixing import paths, some general cleanup