better package structure, commented out types