Fixing parser
A massive cleanup
Moved opcodes to global includes