cleaned the old stuff and implemented a new structure.