Changed root folder names and added scala project