removing auto generated files and refactor