FE #7 Refactoring and structure code base