started breaking things out into folder structure