Refactor the directory strucure