removed unnecessary extra package, moved classes from it, removed
comments