tiny refactoring
added back renamed files