Big restructuring of files. Also, anyInvocation!