added design and popup modules
rearranged files