Tidied project in preparation to make it a library.