Convert base and sandbox entities to files

There's no reason to keep one file inside a folder
Merge pull request #599 from robotboy655/master

Convert base and sandbox entities to files