reorganizing for better file mgmt