BugSense Clean Up

Rearranging files.