Directories reorganization
Update plug-ins