some files & packages restructure