Fix CREDITS
Reorganize properly by folder