cleaned up file structure a bit