Replaced Scala lang files and expanded the file structure