Added Order Controller and Refactors