removed some attributes
directory organization improved
DRY-ed
useless comment removed
moar erfactoring
clone quietly