Made changes to the directory structure and the FunctionalCI target