bugfix directories structure