Fixed sign issues, changed to Scala files