better organization of files & design fix