Name changes to follow a directory pattern
Fixed some ignores
Just keep movin stuff