Cleaned up directory table class