Update directory structure
Update references