pulled out imports from content and user into master files, updated names in assets array'