Moving files and reorganising to better reflect library structure.