Fixed inconsistent methods accessing types
Moved Download to package controller
Fixed imports after movement of Download