Merged a load more files

Almost all changes included, already had basenames