Reorganized Types, next up directory structure