Back to one file

Due to a bug in IDA pro I have put everything back into one file. It's easier.