Cleaned up security parsers
Reorganized parsers