reorgainized file structure