Added origin option
Removed autoloader in favor of composer's and updated coding style