Moved some files and got rid of some others