Removed categories; new architecture; other improvements