Major changes. Getting ready to import epubs