merged classes

merged classes and removed redundancies, created dll lib folder