Added autoloading
Changed directory structure