FC-109 - use new package structure
7 files changed