Using package function instead of build and bringing organization of file in line with recommendations