added proper structure

from other project