Made it more Object Oriented, move files working fully however turns out that changing KAPD isn't working.