Update paths and imports