Cleanup and rearranged files