renaming and some org stuff