Files to be reviewed

Might be a good idea to keep the Validators in here then as well until everything can be moved.