moved academy into separate file