fix renaming regression
allow belongs to removal
Refactor kohana style to psr