Refactor Project to seperate repository