some more reorganization
added animation and some other changes