Some reorganization and logging info/comments
More project cleanup