Started work on reorganising library files