Moved parts into extra files