Feature/NTA_Restapi

Re-formatted code layout to match the format followed by the NTA project.