Refactored the folder hierarchy

Signed-off-by: Patrick Waivers <pwaivers@gmail.com>
fixed the REST source

Signed-off-by: Patrick Waivers <pwaivers@gmail.com>