Regorganized directories to make them more intuitive