[UPDATE] directory organization