Moving master code into new folder