Rearranged folders and made this stupid package a pile of poo.