moved some files and added autoload