change to more clean object structure
missing file
improvements