logic moved to file
files separeted, so remove