Change directory structure close #10