change of ideas: renamed files, started to change logic