Moves Components into Fapi
Merge pull request #7 from krisrybak/fapi

[Fapi] Moves Components into Fapi