Major logic change

1. Transformed all static classes to instance ones.
2. Removed unnesesery code