Support for inner classes and first steps towards registration of inheritance
File locations now based on index rather than line/column