added server,
also improved directory structure