Updated Autoload and changed folder structure.