code cleanup, file relocation needed