Revert "Rename; cleanup"

This reverts commit 0b09c513e1f062f4fa5dbfa462d1776b1715c99a.

Conflicts:
	.gitignore
Changing to a less goofy build system