changed directory structure. and supports R16