Updated the CMakeLists and headers to reflect move of the
AMR classes under Filters/AMR. Further, fixed indentation
issues with AMR headers.

Change-Id: I15efb07d8a99981df14e444a8027e2caa78e9526