Perhaps include new folder setup in package