file renamed
code organization improved