[IMP] Code directory refactoring