Refactored FA course module to smaller pieces