Move classes to their appropriate files
Remove uses of flay