Moved base-classes and typedefs to seperate header. Moved parameter constructors to .cpp file. Minor debugging.