Re-arranged some files