improves arrangement of generated files, adds test files by default