Splitting service project (still have bugs)