refactor autoloader
Merge pull request #18 from daithi-coombes/refactor-autoloader

refactor autoloader