Cleanup and organization all around; particle demo test