renaming a few things and organizing a bit