Seperate

Separate into different files.