moved stuff around for easier asset locations