Tidied up folders and fc submodules