Added utilities
match file structure
very tiny fixes