restructured files
fixed paths to common.ws