Stef/Tom Refactored into separate files