split up classes and moved all statics into same file