Reorganized package structure. Explicit charset for input files.