directory refactoring
utility files