CODE: Const module moved to common subdir