Bug fixes

Added directory assembler