[DEV] change all directory and rework some names (step 4)