Restructured files and added server support.