Remove logic to other project