Cleaned up util folders, added comments