refactoring files a little bit.