Moved and cleaned up some files