Small changes to project structure. Trying to use autoload func.