Changes in core

- Renamed files
- Changes in bd