Refactoring

Dropped sites for file categories since it doesn’t make sense
Better key
Category refactoring
Merge pull request #3 from mlantz/dev

Dev merge with minor changes