Moved all methods and constants that could be moved to static fields in separate classes.