Implementing parser/project restructure