Export mechanism simplication
Move files
Libs update