Seperated MatchingCandidate from fpcs --> new container header file

+ moved fpcs to registration namespace
+ minor formatting stuff