Removed extraneous FSCategory entity.
Did some minor reorganization and refactoring of code as well.