Moved into incubator, renamed package etc based on feedback from Marekn