Total rewrite of the code:
	1. does not construct a modified package.
	2. creates a more coustomized parser