SAParser implementation started, project refactored