Move: classes out of the God file, add: dependencies