Removed old class
Fixed compile errors
Added licenses
Code cleanup