refactored file structure, in preparation for animations