Moved some files around
Removed duplicates