chore: cleaning folder and file names

[skeletor-spaceman]

Description

Just doing some quick refactor on names and removing a duplicated file.

Tests

Additional context

Metadata