Some Clean Up in File Structure