Update removing single source directories and moving everything to data
Update removing single source directories and moving everything to data