Pulled out parser and internal objects
Fixed things broken with the splitup
Start of a cleaner setup