style, comment
remove empty directories from server
solved merging conflicts