Rearranged file structure, I think I like this way best.