Organization / documentation cleanup