Removed installation app, rearranged autoload file