Moved node classes into separate compilation unit; File extension change