Made code more oo. Added moving files and folders