[NEW] refact of the directory structure