Fixing class removal on behavior & Refactoring file scopings