Updated make order & message, and fixed autoloading issues presented by composer