Restructured Project Layout, Removed old REST Services