implemented autoloading, moved files to subfolder