P7 bf solution and file structure changes