Move ficlasses into lib