Move files and change import rules