diff --git a/rvpn/genericlistener/api_collect_connections.go b/rvpn/server/api_collect_connections.go
similarity index 100%
rename from rvpn/genericlistener/api_collect_connections.go
rename to rvpn/server/api_collect_connections.go
diff --git a/rvpn/genericlistener/api_collect_domains.go b/rvpn/server/api_collect_domains.go
similarity index 100%
rename from rvpn/genericlistener/api_collect_domains.go
rename to rvpn/server/api_collect_domains.go
diff --git a/rvpn/genericlistener/api_collect_server.go b/rvpn/server/api_collect_server.go
similarity index 100%
rename from rvpn/genericlistener/api_collect_server.go
rename to rvpn/server/api_collect_server.go
diff --git a/rvpn/genericlistener/api_collect_server_domains.go b/rvpn/server/api_collect_server_domains.go
similarity index 100%
rename from rvpn/genericlistener/api_collect_server_domains.go
rename to rvpn/server/api_collect_server_domains.go
diff --git a/rvpn/genericlistener/api_collect_servers.go b/rvpn/server/api_collect_servers.go
similarity index 100%
rename from rvpn/genericlistener/api_collect_servers.go
rename to rvpn/server/api_collect_servers.go
diff --git a/rvpn/genericlistener/api_collect_status.go b/rvpn/server/api_collect_status.go
similarity index 100%
rename from rvpn/genericlistener/api_collect_status.go
rename to rvpn/server/api_collect_status.go
diff --git a/rvpn/genericlistener/api_collect_status_dead time.go b/rvpn/server/api_collect_status_dead time.go
similarity index 100%
rename from rvpn/genericlistener/api_collect_status_dead time.go
rename to rvpn/server/api_collect_status_dead time.go
diff --git a/rvpn/genericlistener/api_collect_status_traffic.go b/rvpn/server/api_collect_status_traffic.go
similarity index 100%
rename from rvpn/genericlistener/api_collect_status_traffic.go
rename to rvpn/server/api_collect_status_traffic.go
diff --git a/rvpn/genericlistener/api_interface.go b/rvpn/server/api_interface.go
similarity index 100%
rename from rvpn/genericlistener/api_interface.go
rename to rvpn/server/api_interface.go
diff --git a/rvpn/genericlistener/conn_tracking.go b/rvpn/server/conn_tracking.go
similarity index 100%
rename from rvpn/genericlistener/conn_tracking.go
rename to rvpn/server/conn_tracking.go
diff --git a/rvpn/genericlistener/conn_wedge.go b/rvpn/server/conn_wedge.go
similarity index 100%
rename from rvpn/genericlistener/conn_wedge.go
rename to rvpn/server/conn_wedge.go
diff --git a/rvpn/genericlistener/connection.go b/rvpn/server/connection.go
similarity index 100%
rename from rvpn/genericlistener/connection.go
rename to rvpn/server/connection.go
diff --git a/rvpn/genericlistener/connection_registration.go b/rvpn/server/connection_registration.go
similarity index 100%
rename from rvpn/genericlistener/connection_registration.go
rename to rvpn/server/connection_registration.go
diff --git a/rvpn/genericlistener/connection_table.go b/rvpn/server/connection_table.go
similarity index 100%
rename from rvpn/genericlistener/connection_table.go
rename to rvpn/server/connection_table.go
diff --git a/rvpn/genericlistener/domain_loadbalance.go b/rvpn/server/domain_loadbalance.go
similarity index 100%
rename from rvpn/genericlistener/domain_loadbalance.go
rename to rvpn/server/domain_loadbalance.go
diff --git a/rvpn/genericlistener/domain_mapping.go b/rvpn/server/domain_mapping.go
similarity index 100%
rename from rvpn/genericlistener/domain_mapping.go
rename to rvpn/server/domain_mapping.go
diff --git a/rvpn/genericlistener/domain_track.go b/rvpn/server/domain_track.go
similarity index 100%
rename from rvpn/genericlistener/domain_track.go
rename to rvpn/server/domain_track.go
diff --git a/rvpn/genericlistener/listener_generic.go b/rvpn/server/listener_generic.go
similarity index 100%
rename from rvpn/genericlistener/listener_generic.go
rename to rvpn/server/listener_generic.go
diff --git a/rvpn/genericlistener/manager.go b/rvpn/server/manager.go
similarity index 100%
rename from rvpn/genericlistener/manager.go
rename to rvpn/server/manager.go
diff --git a/rvpn/genericlistener/one_conn.go b/rvpn/server/one_conn.go
similarity index 100%
rename from rvpn/genericlistener/one_conn.go
rename to rvpn/server/one_conn.go
diff --git a/rvpn/genericlistener/send_track.go b/rvpn/server/send_track.go
similarity index 100%
rename from rvpn/genericlistener/send_track.go
rename to rvpn/server/send_track.go
diff --git a/rvpn/genericlistener/setup.go b/rvpn/server/setup.go
similarity index 100%
rename from rvpn/genericlistener/setup.go
rename to rvpn/server/setup.go
diff --git a/rvpn/genericlistener/status.go b/rvpn/server/status.go
similarity index 100%
rename from rvpn/genericlistener/status.go
rename to rvpn/server/status.go
diff --git a/rvpn/genericlistener/status_dead_time.go b/rvpn/server/status_dead_time.go
similarity index 100%
rename from rvpn/genericlistener/status_dead_time.go
rename to rvpn/server/status_dead_time.go
diff --git a/rvpn/genericlistener/status_req_type.go b/rvpn/server/status_req_type.go
similarity index 100%
rename from rvpn/genericlistener/status_req_type.go
rename to rvpn/server/status_req_type.go
diff --git a/rvpn/genericlistener/status_traffic_connections.go b/rvpn/server/status_traffic_connections.go
similarity index 100%
rename from rvpn/genericlistener/status_traffic_connections.go
rename to rvpn/server/status_traffic_connections.go
diff --git a/rvpn/genericlistener/status_traffic_stats.go b/rvpn/server/status_traffic_stats.go
similarity index 100%
rename from rvpn/genericlistener/status_traffic_stats.go
rename to rvpn/server/status_traffic_stats.go
diff --git a/rvpn/genericlistener/tls_get_hello.go b/rvpn/server/tls_get_hello.go
similarity index 100%
rename from rvpn/genericlistener/tls_get_hello.go
rename to rvpn/server/tls_get_hello.go