Tidied up src tree