Move ArchiDroid Detect to proper block