File changes

Cleans up file structure