Tidied up all the files and moved the usings