Cleaned up and made scala skeleton library independent