Added new file structure and new entity renderer