Additional project cleanup & rename