Separate Logic and services in two folders, adapt tests