Started move file handler stuff into seperate file
Started move file handler stuff into seperate file