Made package structure more sensible now that things start to work.