Reorganize files
Add more to types
Replace tabs with spaces