Fixed package hierarchy, added manifest, tested module importing, fixed some stupid mistakes.