directory arrangment and removeal of server stuff