Adjusted Module Hierarchy

Adjusted Module Hierarchy
Got rid of the AFRP-Utils dependency
Got rid of the SF file and data type