fixed some minor problems, moved to seperate folders for Decorators