Moved Target detection logic into corresponding Classes