Adding in directory structure and utils