Deprecate scope
Add parser base classes
(Re)Move files