Started working on modular file system
Implemented entity naming.