General cleanup, a few files and helpes moved and deleted. Checked syntax in helpers