Some preparation for padrino. Updating import script & datamodel