Refactor directory structure, add iconv-lite to source