Re-organized some files