Seperated things into different files.
Fixed last commit