Reorganziing
Small changes