Code cleanup
Added web track package