Move to dedicated package, clean up, setup full script structure