updated structure

updated code structure