NativeCriteria - change project structure