Moved good code to proper spot
Change package name from Parser2 to Parser