Separated all library classes to prepare to use autoloading