Feature, classes, use relative reference

Change-Id: I1942580e78d3c9e83fdad4927532186441fe3298
16 files changed