changed files layout for proper testing support