Restructure once more
Further set-up structure of directory