Revert "Refactoring code"

This reverts commit ae6dd900042b5db4c1cef69fc1e50ac6ab07e142.

Conflicts:
	CristallParser.cpp