Refactorized folders and FB folder added