Big changes: two-step parsing, bootstrap, sample project hierarchy