Fix paths and imports