Update directory structure
Code quality [ci-skip]