separated raw files and removed generated files