Removed old code
Removed old test directory
Added service hooks