Added missing animation module imports. Rearranged imports to match folder structure