Extracted some stuff into /src from /www