Started refactoring FWE, updated directory structure