s: pacakge modules moved to hierarhical folder. this closes #23