formalised package names and made module layout backward compatible