Moved a lot of methods/functions to another file