Simplify directories; change package to org.lumeh...