change package structure
updated in response to comments on diachron model