reorganized folders
added wildcard to autoload folders