Reorganized

Sub folders added, Also the server peer added to