directory organization
refactored utility functions