Update directories

Update directories
Enhance installation