Move to proper package (Got a website)