BTCAR-DBG: Files' structure refactored