Added new classes and hopefully faster file building (threaded now)