Updated Composer autoload and moved functions to static methods