Removing unnecesary file requirying
Intorducing Window class, implementing right methods for TargetLocator class, relocating corresponding tests