Cleaned up some duplicates and moved some files