Added server and separated files