File re-organization - cleaning things up