Reorganization and beginning of source parsing