Added enum Dir, private inner class in Structure