FC-109 - use new package structure
14 files changed