Reorganising functional tests folder structure