fixed hard word partitions
Better organization of files