Cleanup branch creation. Structures utils package
Merges cleanup branch with utilities package cleanup