Deleted unused Classes, Added Touchlistener