Move entity files into parent directory to eliminate namespace redundencies.

Signed-off-by: Se7enChat <se7enchat@zoho.com>