More bug fixes / cleanup.
Move files around and updates so that the project is presentable.