Added files for features and type.php
Removed unnecessary classes