FLUID-5037: Files reorganised, dependencies added