Moving more asset related code into own module.