More cleanup
Adding in more files