Organize better
Experiment with mappings, fix documentation